Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 18:39:28 +0000 (18:39 +0000)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 18:39:28 +0000 (18:39 +0000)
commit86ec1e94a541a454f38b00a1e304b14fa13cd16b
treea7c9509efee247967a62efb517858866126abe69
parent91eacb2b661342ea5e49dce38097e08a6fc78342
parentcae4acfd129d3096bfaf5b8af52d97b641623dc0
Merge from trunk.
src/ChangeLog
src/xdisp.c